* lisp/mail/unrmail.el (unrmail): Do not mangle the mbox From line

fixes 2012-12-07 change.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 847124c280d448c6e17504c56932ff583c1bde3d..0ad42a859e0bfe0a251cad26445dd49ce8158614 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-19  Glenn Morris  <rgm@gnu.org>
+
+       * mail/unrmail.el (unrmail): Do not mangle the mbox From line;
+       fixes 2012-12-07 change.  (Bug#13499)
+
 2013-01-19  Leo Liu  <sdl.web@gmail.com>
 
        * dired.el (dired-get-marked-files): Prune erroneous values due to

diff --git a/lisp/mail/unrmail.el b/lisp/mail/unrmail.el
index 85e8bb4f863e0130b213be7f6999b4e673567f3b..406009af5e29c842208e47f2910f709b6717c213 100644 (file)
--- a/lisp/mail/unrmail.el
+++ b/lisp/mail/unrmail.el
@@ -241,6 +241,7 @@ The variable `unrmail-mbox-format' controls which mbox format to use."
            (when keywords
              (insert "X-RMAIL-KEYWORDS: " keywords "\n"))
            (goto-char (point-min))
+           (forward-line 1)            ; skip `From ' line
            ;; Convert From to >From, etc.
            (let ((case-fold-search nil)
                  (fromline (if (eq 'mboxrd unrmail-mbox-format)